From d83294b2ac4594a065aa845260e9e251fcdf56cd Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 2 Aug 2013 18:47:12 +0800 Subject: [PATCH] MSVC builds: Enhance Binary Installation Update the gtk-install-bin property sheets so that it does not "install" the wrong GDK DLL/LIB when building a broadway-enabled GDK when the non-Broadway GDK had been previously built. --- build/win32/vs10/gtk-install-bin.props | 20 ++++++++++++++------ build/win32/vs9/gtk-install-bin.vsprops | 16 ++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/build/win32/vs10/gtk-install-bin.props b/build/win32/vs10/gtk-install-bin.props index 54fe562334..b1602d3065 100644 --- a/build/win32/vs10/gtk-install-bin.props +++ b/build/win32/vs10/gtk-install-bin.props @@ -10,9 +10,9 @@ mkdir $(CopyDir)\bin mkdir $(CopyDir)\lib -if exist ..\..\..\MSVC_Release_Broadway goto DO_BROADWAY_BIN +if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN -if exist ..\..\..\MSVC_Debug_Broadway goto DO_BROADWAY_BIN +if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin @@ -33,16 +33,24 @@ copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin -if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.dll $(CopyDir)\bin +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin -if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin + +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin -if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.dll $(CopyDir)\bin +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib -if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib +if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.exe $(CopyDir)\bin diff --git a/build/win32/vs9/gtk-install-bin.vsprops b/build/win32/vs9/gtk-install-bin.vsprops index 08ede66264..47e79e8407 100644 --- a/build/win32/vs9/gtk-install-bin.vsprops +++ b/build/win32/vs9/gtk-install-bin.vsprops @@ -11,8 +11,8 @@ mkdir $(CopyDir)\bin mkdir $(CopyDir)\lib -if exist ..\..\..\MSVC_Release_Broadway goto DO_BROADWAY_BIN -if exist ..\..\..\MSVC_Debug_Broadway goto DO_BROADWAY_BIN +if "$(ConfigurationName)" == "Release_Broadway" goto DO_BROADWAY_BIN +if "$(ConfigurationName)" == "Debug_Broadway" goto DO_BROADWAY_BIN copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib @@ -24,12 +24,16 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gdk-3-vs*.dll $(CopyDir)\bin copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin -if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.dll $(CopyDir)\bin -if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib +if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gtk-3-*.dll $(CopyDir)\bin +if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gailutil-3-*.dll $(CopyDir)\bin +if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gtk*-$(ApiVersion).lib $(CopyDir)\lib +if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gailutil*-$(ApiVersion).lib $(CopyDir)\lib if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin -if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.dll $(CopyDir)\bin -if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib +if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gtk-3-.dll $(CopyDir)\bin +if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gailutil-3-.dll $(CopyDir)\bin +if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib +if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin :DONE_BIN " -- 2.30.2